fixed a cheeky bug
added a big new feature here