Status done-ish, now needs interfacing, working on new task