all sorts of changes, new mockup ugh