Done basically
Fix some bugs and complete demo