Cleaned a bit, Canvas class IS NOT WORKING