working
models done
formatting