Fixing some bugs and pretending to work