* wip

* Use AlignedBuffer instead of vector for performance

* cleanup

* More cleanup

* Revert Constant change
Co-authored-by: Scott Cyphers <diyessi@users.noreply.github.com>