Joshr dev

inc 0.1.43