Commited Current status

Fairly complete to use