Removed TODOs, kinda got main thread GL going