Improved some Objects not finished but stopped work for today.
Also moved to IntelliJ IDEA