Started implementing Crusty's changes (#113)