flesh out the orm some