Fixed some bugs
Need to change to an ArrayList
Soon to come Print Function