Added todo stuff
Fix fatal error
Fixed error
Fixed another bug
Updated todo