Added some more code/renamed List code