Added more functions..

Closer to being done! Still got lots to do before making it functional