Major Update

Currently Broken on purpose; will need to fix