Initial changes since fork of AkiraFirst project