Internals branch

Yes this should not be worked on so soon.