Exapanding functionality, seperated into own class file