First real update

Not sure why this was not commited last time I pushed code, sometimes I
think Github for Windows is seriously BUG filled!