Did some TODO stuff