60% done

Signed-off-by: Marc Levesque <Qormix@gmail.com>