Started adding basic data structures