Build 4

Finished importing.. Now cleaning + fixing