Resolve import issues, work on testing