moved some things around, added configuration