another bunch of changes, got rid of all the statics because that was a dumb idea