Version 0.4.1.0

Logic is working. Framing needs work