all logic done

All logic has been implemented and now need to implement the views only