ok
deleted stuff
finished gui
fixed conflicts, should be all up to date