Bugfixing. Not ready to build yet