Updated to most recent state.
Begin adding masonly
Included mansonly and corresponding css.
before merge