initial commit after night long hacking