removed bs, streamlined and ready to be extended by incoming team members