finished for the demo, more work is needed next week