Final commit

almost done