Completed mechanichs for #218. Only thing missing is CSS