Make things actually functional, if a bit rough around the edges