New code to complete initial skeleton project