Finalizing development (continued) :P