Basically working, now need to get the animated part in