Added todo things and implemented some features