Added something on master
Started work on new features.
Added soem stuff. I plan to rebase this and push it.
Pulled down dev and merged it after rebasing into master.