A few tests and some basic changes, still a WIP