commit of some working things and basic structure