Huge update

VERY sloppy methods