One Big Merge

This is exactly the same as the frameworks/base merge. I need to keep this here and learn how to manage the repo's properly. I can't do any damage using this branch and hopefully this will show I am not a complete retard.