Added basic parsing logic and data structures