Finishing EVERYTHING FOR MILESTONE 2