adding TODO's and fixing some obviously broken parts
refactor package name, com.* -> net.*