Version 1.1 - with complete UI