Moved all functions into objects