Major rewrite almost finished