Added stuff from initial development