made changes to accomodate state, and added in beginning javadocs, will test tmrw