File Setup

further file setup and minor code additions