cleaned up -- STILL got useless methods in there. what a shame.