Major changes

Still having issues with certain lines of code