bit of a restructure and added basic organism