Rules done, needs work on UI