4-2 done! (also added to intelij)