Committing this mess, clean up later