Major rewrite, everything new, simpler, cleaner, etc :)