Added basic parsing and skeleton