Change some design details, attempt data parsing