form.lib and account.lib need to be handled better