Started adding some basic, simple validation checks