still cleaning, started consolidating funcs