Constrictor Refactor/goldencahill