Finished OOing + some debugs