Added some useful code I have, and further organised classes