Lots of updates! Almost done