ahh, didn't quite complete all my todo list, forgot one last thing, but I can do it tomorrow