Adds a couple more functions, but currently broken