work in progress
still fixing
moore fixes