[issue11] Completed basic functionality