weekend work

basically rewrote everything lol