more changes
mockup finish
clean up