Better collision detection, window api, rudementary upgrade store