Jaysen's changes
Jaysen about to merge
Jaysen's functionality changes