Added modules and updated some
A bunch of deletes