Works 100%

Added extra methods and fixed a few bugs