More updates

Adding more of the essential framework, still not functional.