Day 1 final commit. Working but still WIP.