Last push before changing to libgdx