add calculator system to filter (unfinished) and so on