going with this may try to merge with master later