Work in progress

Continueing work