Implmenting More Angular, and refining MYSQL queries