moved things around

added future capability