Things are still wonky and being worked on