WORK IN PROGRESS!!!! REVAMPING