Ditched export for simplicity. Added some front end logic