Some updates and structual changes... IT BEGINS AGAIN!