Pull request for fixing broken things

yay, actual functionality!