last commit on david's freestyle prototype.  changes after this will be according to the final mockup