Look, third commit and already cleanup; Also, forgot to commit last night work