bunch of new stuff in this commit :D