working on backend and tightening up