Work in progress

Just a bit more...