Initial version
Eclipse left overs
Initial version