working first version to be synced on Geoff's comp to test glassfish