wip - filled out some functionality, moved everything over to just a container instead of a gimped wrapper