Capstone 2014 project rewrite - no database