finished adding collision component, added better exception handling