basically working
updated canjs