Updated
Additional functionality
updated for UI
Java stuff - not really needed…