did some more work, transferring to pi