Kind of initial commit, still has some leftover code from Trading