WIP
WIP
some basic and barely working tests added