got everything to a working state, looks solid now