Add some further features
CRASHES! Needs debugging! NullPointer at an unreported line
Removed Eclipse project (not needed on this branch)