Committing mah work so far. Very messy!