Whole lotta changes. forgot to commit. sorry