Big Update 4/17

Does not include Nicks awesome changes