Started trying to make things more modular. Looking for that segfault issue.