Continuing website -> web app conversion. Just about cracked it now.