***WIP** Broken - Adding method validation