Partial update, has tests mostly
More updates!

This is progressing so slow...