Started working on heavy cleanup!