Minor changes
Finsished adding all functions
Finished testing