Interim branch commit

Working on Snail eyes, some mockups added