Recoded everything plus added cool features