Worked on pieces now working on rules.java
worked on a bumch of different files