Finished first version of entry parsers