Commit of a basic framework. Some features working.