Less janky buffer filling.
WIP.
Add simple subpackage.