refactored files, added test canvas