Added libs and started incorporating into model