Feature Lock

All basic  functions now implemented for demo.