All features added except file I/O & splash screen