Haven't had much time lately to work on this, so it took quite awhile 0_o.