Revamping some things until further notice!