Mere of staging with master

More than fully functional! Now we just need to add more features... modify styles... refactor... there's no end, really.