More WIP, starting unit tests