Pretty Much Done

Some cleaning up is needed. Will post when that is done