Added the mockup
some cleanups and fixes