Moved to eclipse, updated code

Updating code from sister repo