Added testing/training stuff. Possibly going to try slight angle-fill rewrite.