This better be the last commit of the night. Added more mockup to the source.