Changed some things around
Started part2