dev on models & front-end