Some methods filled in, some changed. Lots of work left to do