bugs worked out...now add features!