More Logic WIP

(it compiles, so I push it!)