Initial version - basic functionality