A large commit to make everything work. This is a nice frist shot!