checkpoint: seems to work :)
cleaning up rough edges. checkpoint