Resync - taking break to fix eclipse

Not able to work on mod for short while eclipse workspace is rebuilt.