Initial commit of somewhat working code