Finish Model docs and implementation of fields