wip 1

basic changes