Feature and steps refactoring- FINAL COMMIT

Final commit, everything setup properly for video demo