less compilation errors
less compilation errors (only MainModel and MainActivity left)