not sure where this is at...
dealing with a merge
more progress
fixed conflict
completes class methods