First commit with a pretty much 90% bug free build!