Still just trying to speed things up, get rid of unnesecary code and
such