just have to fill in the javadoc now, will do that tommorow durring lunch