Latest work-in-progress

Still waiting on response from pic2shop people before making this live