Fixed bug. Abstracted thangs