Cleaned up things. Uses updated build system