Progress

Needs cleaning of unnecessary stuff & UCs