Almost completely done!

Still needs polishing and ending