progress
Almost done, i fell in love with JAVA again :)