COMMIT 3

Very unfinished
didn’t implemement/polymorph yet
many of last commit comments still apply