Completed

Bunch of stuff