worked on the architecture a little more, added some more files