Removed comments - STILL HAS YOUR TODOs