Revamp internals

Oh man, did I revamp the internals.