Got a bit more done...

### Latest WIP ###