Commits my progress... almost done