Finished the optimization wrappers and removing some debug variables
added a TODO file