Bugfix: replaced + with : in ternary operatory
Began work testing random components