Added sub stuff, please text! #90