restructure solution and docs!

oh yeah, also now includes an attempt for a captionless form. Sort of
works but needs some tweaking.