Removed printfs, added todos